Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CP-46076 for XS9: To remove fcoe-utils, remove FCOE capabilty with LLDPAD tools from bugtool? #111

Closed

Conversation

DeliZhangX
Copy link

@DeliZhangX DeliZhangX commented May 15, 2024

Update:

This PR is not needed as explained in @bernhardkaindl's comment in CP-46076:

For removing fcoe-utils from XS9 as part of CP-46076, the only change is:

The only needed change for disabling the dependency of xenserver-status-report.rpm on fcoe-utils is to remove the Requires: for fcoe-utils for XS9 at line 32 in xenserver-status-report.spec:

+ %if 0%{?xenserver} < 9
  Requires:       fcoe-utils
+ %endif

PS: For further details, see the comment of @bernhardkaindl below. For example, this PR would also have removed the collection of other commands that are not part of fcoe-utils, but of LLDPAD:

rpm -qf /usr/sbin/lldptool /usr/sbin/dcbtool
lldpad-1.0.1-10.xs8.x86_64
lldpad-1.0.1-10.xs8.x86_64

@bernhardkaindl bernhardkaindl changed the title Remove FCOE related collecting CP-46076 for XS9: To remove fcoe-utils, remove FCOE capabilty with LLDPAD tools from bugtool? May 15, 2024
@bernhardkaindl
Copy link
Collaborator

bernhardkaindl commented May 15, 2024

@DeliZhangX: I added the explanation to CP-46076 why this change is not needed to remove the dependency on fcoe-utils for XS9.

In fact, two of the tools that would no longer be called if this would be merged are not even in fcoe-utils:

rpm -qf /usr/sbin/lldptool /usr/sbin/dcbtool
lldpad-1.0.1-10.xs8.x86_64
lldpad-1.0.1-10.xs8.x86_64

As I said in my explanation in CP-46076

  • xen-bugtool is happy even when tools and files that it is asked to collect are not installed
    • it just ignores those files and tools that are not found.

Therefore, this change is not needed and would affect XS8

Also, they would not target master, which is currently in use for the XS8 product and is good for backports to the Yangtze as well (if at all, into a new release/xs9 branch.

As I explained in my comment to CP-46076, the only change that you need to make to remove fcoe-utils from XS9 is to disable the Requires of it the xenserver-status-report.spec at line 32:

+ %if 0%{?xenserver} < 9
  Requires:       fcoe-utils
+ %endif

@@ -268,7 +266,6 @@ BIOSDEVNAME = 'biosdevname'
BRCTL = 'brctl'
CHKCONFIG = 'chkconfig'
CHRONYC = 'chronyc'
DCBTOOL = 'dcbtool'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only as a side note, for reference (obsolete) as this PR is not needed:

This package is not a file from fcoe-utils:

rpm -qf /usr/sbin/dcbtool
lldpad-1.0.1-10.xs8.x86_64

@@ -286,7 +282,6 @@ IPTABLES = 'iptables'
ISCSIADM = 'iscsiadm'
KPATCH = 'kpatch'
LIST_DOMAINS = 'list_domains'
LLDPTOOL = 'lldptool'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only as a side note, for reference (obsolete) as this PR is not needed:

This package is not a file from fcoe-utils:

rpm -qf /usr/sbin/lldptool
lldpad-1.0.1-10.xs8.x86_64

@bernhardkaindl
Copy link
Collaborator

Because I added comments on other files, just to re-iterate:

The only needed change for disabling the dependency of xenserver-status-report.rpm on fcoe-utils is to remove the Requires: for fcoe-utils for XS9 at line 32 in xenserver-status-report.spec:

+ %if 0%{?xenserver} < 9
  Requires:       fcoe-utils
+ %endif

@DeliZhangX
Copy link
Author

DeliZhangX commented May 16, 2024

Also, they would not target master, which is currently in use for the XS8 product and is good for backports to the Yangtze as well (if at all, into a new release/xs9 branch.

Thanks for your comments.
May I ask when you will merge master, xs8 and yangtze to single one branch?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants